abb82eea19320cb6ea3162d0907a0f725e5526ec,oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java,Commit,pessimisticMerge,#CommitHook#number#CommitInfo#,320

Before Change


                        builder.setChildNode(ROOT, hook.processCommit(
                                base.getChildNode(ROOT), head.getChildNode(ROOT)));
                        builder.removeProperty("token");
                        builder.removeProperty("timeout");

                        // complete the commit
                        SegmentNodeState newHead =

After Change


                         // lock acquired; rebase, apply commit hooks, and unlock
                        builder = prepare();
                        builder.removeProperty("token");
                        builder.removeProperty("timeout");

                        // complete the commit
                        if (setHead(builder)) {